Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Enhancement][BugFix] Jboss Fuse 6 build fixes & enhancements #1246

Merged
merged 2 commits into from
May 13, 2016
Merged

[Enhancement][BugFix] Jboss Fuse 6 build fixes & enhancements #1246

merged 2 commits into from
May 13, 2016

Conversation

redhatrises
Copy link
Contributor

@redhatrises
[Enhancement][BugFix] Jboss Fuse 6 build fixes & enhancements
265dcc7 
- Update Makefile to be able to build with regular OVAL and OVAL5.11
- Fix deprecated OVAL tags
- Fix cpe_generate.py to use
- Part of ComplianceAsCode#1046
@redhatrises redhatrises added bugfix Fixes to reported bugs. enhancement General enhancements to the project. labels May 12, 2016
@redhatrises redhatrises added this to the 0.1.30 milestone May 12, 2016
@iankko iankko self-assigned this May 13, 2016
iankko
iankko reviewed May 13, 2016
View reviewed changes
JBoss/Fuse/6/Makefile
# don't call verify-references.py with "--rules-with-invalid-checks" argument, since the
# OVAL checks using the 5.11 OVAL version will not be included in that case
@echo -e "\nWarning:\n"
@echo -e "\tRHEL/7 content build using oscap not supporting OVAL-5.11 language version detected!"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Warning is OK. But it should be "\tJBoss/Fuse/6" instead of RHEL/7.

@iankko
Copy link

iankko commented May 13, 2016

Also, issuing make content with oscap supporting OVAL-5.11 (openscap-1.2.5-3.el7.x86_64) returns error due to missing input/oval/oval_5.11 directory:

# make content
...
# Search ../../../shared/oval/oval_5.11 and input/oval/oval_5.11 directories to find all product specific
# OVAL-5.11 checks, which are regular files (not symlinks). Merge the final list into build/fuse6_oval
# directory
find ../../../shared/oval/oval_5.11 input/oval/oval_5.11 -maxdepth 1 -type f -name '*.xml' -exec cp {} build/fuse6_oval ';'
find: ‘input/oval/oval_5.11’: No such file or directory
make: *** [checks] Error 1

@iankko
Copy link

iankko commented May 13, 2016

Besides the above issues, this PR looks good to me.

@redhatrises
Minor JBoss 6 build fixes
90186a3 
- Remove RHEL references
- Add README for empty oval_5.11 directory
@redhatrises
Copy link
Contributor Author

@iankko forgot to fix those before sending in the PR. They have been fixed now.

@iankko
Copy link

iankko commented May 13, 2016

This version looks good to me. Thank you for the update && changes itself!. ACK.

@iankko iankko merged commit ea13b91 into ComplianceAsCode:master May 13, 2016
@redhatrises redhatrises deleted the Fuse_build_fixes branch May 16, 2016 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bugfix Fixes to reported bugs. enhancement General enhancements to the project.
Projects
None yet
Milestone
0.1.30
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@redhatrises @iankko